January 2006 changes to Google Maps

diff --git a/gpsbabel/google.c b/gpsbabel/google.c
index e5c72444892ce5288a1cc2acd4ae97c9072604d6..9b9de4417c79adbd01df5ce4053f0d98e68c299e 100644 (file)
--- a/gpsbabel/google.c
+++ b/gpsbabel/google.c
@@ -46,7 +46,8 @@ google_read(void)
 #else
 
 static xg_callback      goog_points, goog_levels, goog_poly_e, goog_script;
-static xg_callback     goog_segment_s, goog_segment;
+static xg_callback     goog_segment_s, goog_segment, goog_td_s, goog_td_b;
+static xg_callback     goog_td_e;
 
 static 
 xg_tag_mapping google_map[] = {
@@ -56,6 +57,9 @@ xg_tag_mapping google_map[] = {
        { goog_script,  cb_cdata,       "/html/head/script" },
        { goog_segment_s, cb_start,      "/page/directions/segments/segment" },
        { goog_segment, cb_cdata,      "/page/directions/segments/segment" },
+       { goog_td_s,    cb_start,      "/div/table/tr/td" },
+       { goog_td_b,      cb_cdata,      "/div/table/tr/td/b" },
+       { goog_td_e,    cb_end,        "/div/table/tr/td" },
        { NULL,         0,              NULL }
 };
 
@@ -105,6 +109,7 @@ void goog_levels( const char *args, const char **unused )
 }
 
 static char goog_segname[7];
+static char *goog_realname = NULL;
 
 /*
  * The segments contain an index into the points array.  We use that
@@ -134,6 +139,45 @@ void goog_segment( const char *args, const char **unused )
        }
 }
 
+void goog_td_s( const char *args, const char **attrv )
+{
+       const char **avp = &attrv[0];
+       int isdesc = 0;
+       while (*avp) {
+               if ( 0 == strcmp(avp[0], "class" )) {
+                       isdesc = !strcmp(avp[1], "desc" );
+               }
+               else if ( isdesc && (0 == strcmp( avp[0], "id" ))) {
+                       snprintf( goog_segname, sizeof(goog_segname),
+                               "\\%5.5x",
+                               atoi(avp[1] + 6 ));
+               }
+               avp += 2;
+       }
+}
+       
+void goog_td_b( const char *args, const char **attrv ) {
+       if ( goog_segname[0] == '\\' && !strchr( args, '\xa0')) {
+               if ( goog_realname ) {
+                       xfree( goog_realname );
+                       goog_realname = NULL;
+               }
+               goog_realname = xmalloc( strlen(args)+1);
+               strcpy( goog_realname, args );
+       }
+}
+void goog_td_e( const char *args, const char **attrv ) 
+{
+       if ( goog_segname[0] == '\\' && goog_realname ) {
+               goog_segment( goog_realname, attrv );
+       }
+       goog_segname[0] = '\0';
+       if ( goog_realname ) {
+               xfree( goog_realname );
+               goog_realname = NULL;
+       }
+}
+
 static long decode_goog64( char **str )
 {
        long result = 0;
@@ -227,8 +271,11 @@ google_read(void)
        if ( script ) 
        {
                char *xml = strchr( script, '\'' );
+               char *dict = strstr( script, "({" );
+               
                char *end = NULL;
-               if ( xml ) {
+               
+               if ( xml && (!dict || (xml < dict ))) {
                        xml++;
                        end = strchr( xml+1, '\'' );
                        if ( end ) {
@@ -238,6 +285,43 @@ google_read(void)
                                xml_readstring( xml );
                        }
                }
+               else if ( dict ) {
+                 encoded_points = strstr( dict, "points: '" );
+                 encoded_levels = strstr( dict, "levels: '" );
+                 char *panel = strstr( dict, "panel: '" );
+                 
+                 if ( encoded_points && encoded_levels ) {
+                   encoded_points += 9;
+                   encoded_levels += 9;
+                   end = strchr( encoded_points, '\'' );
+                   if ( end ) {
+                     *end = '\0';
+                     end = strchr( encoded_levels, '\'' );
+                     if ( end ) {
+                       *end = '\0';
+                       goog_poly_e( NULL, NULL );
+                     }
+                   }                 
+                 }
+                 if ( panel ) {
+                   panel += 8;
+                   end = strstr( panel, ">'," );
+                   if ( end ) {
+                     *(end+1) = '\0';
+                     end = panel;
+                     while ( (end = strstr( end, "\\\"" ))) {
+                       strcpy( end, end+1 );
+                     }
+                     end = panel;
+                     while ( (end = strstr( end, "\\'" ))) {
+                       strcpy( end, end+1 );
+                     }
+                     xml_deinit();
+                     xml_init( NULL, google_map, NULL );
+                     xml_readstring( panel );
+                   }
+                 }
+               }
                xfree( script );
        }
 }

diff --git a/gpsbabel/testo b/gpsbabel/testo
index 9295e60103d75ab1fe099f7350825d737aa7ff2c..07c8f59c81be6387769ea05398faf80c6f4dd8ca 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -620,12 +620,16 @@ compare ${TMPDIR}/igc.gpx reference/igc2_gpx.out
 # Google Maps XML test
 #
 rm -f ${TMPDIR}/google.out
-${PNAME} -i google -f reference/google.xml -o arc -F ${TMPDIR}/google.out
-compare ${TMPDIR}/google.out reference/google.arc
+${PNAME} -i google -f reference/google.xml -o csv -F ${TMPDIR}/google.out
+compare ${TMPDIR}/google.out reference/google.csv
 
 rm -f ${TMPDIR}/google.out
-${PNAME} -i google -f reference/google.js -o arc -F ${TMPDIR}/google.out
-compare ${TMPDIR}/google.out reference/google.arc
+${PNAME} -i google -f reference/google.js -o csv -F ${TMPDIR}/google.out
+compare ${TMPDIR}/google.out reference/google.csv
+
+rm -f ${TMPDIR}/google.out
+${PNAME} -i google -f reference/google_jan_06.html -o csv -F ${TMPDIR}/google.out
+compare ${TMPDIR}/google.out reference/google_jan_06.csv
 
 #
 # DeLorme .an1 tests